debug: Remove pixel-cache debug categories

We have no more pixel cache, so they are kind of useless.

diff --git a/docs/reference/gtk/running.sgml b/docs/reference/gtk/running.sgml
index 8f48d3dd1b249d229005db32d3371f5bfc7ca3a8..3bc8f3571475a2671c418dcfcad2705a805b6430 100644 (file)
--- a/docs/reference/gtk/running.sgml
+++ b/docs/reference/gtk/running.sgml
@@ -178,18 +178,6 @@ additional environment variables.
       <term>no-css-cache</term>
       <listitem><para>Bypass caching for CSS style properties</para></listitem>
     </varlistentry>
-    <varlistentry>
-      <term>no-pixel-cache</term>
-      <listitem><para>Disable the pixel cache</para></listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>plugsocket</term>
-      <listitem><para>Cross-process embedding</para></listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>pixel-cache</term>
-      <listitem><para>Pixel cache</para></listitem>
-    </varlistentry>
     <varlistentry>
       <term>printing</term>
       <listitem><para>Printing support</para></listitem>

diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h
index ec806dc784f1cb33241c3c7d1abedb6d35b7a8b2..3f624a91107deed09eba0d313681d0f46f3fd452 100644 (file)
--- a/gtk/gtkdebug.h
+++ b/gtk/gtkdebug.h
@@ -49,13 +49,11 @@ typedef enum {
   GTK_DEBUG_SIZE_REQUEST    = 1 << 11,
   GTK_DEBUG_NO_CSS_CACHE    = 1 << 12,
   GTK_DEBUG_BASELINES       = 1 << 13,
-  GTK_DEBUG_PIXEL_CACHE     = 1 << 14,
-  GTK_DEBUG_NO_PIXEL_CACHE  = 1 << 15,
-  GTK_DEBUG_INTERACTIVE     = 1 << 16,
-  GTK_DEBUG_TOUCHSCREEN     = 1 << 17,
-  GTK_DEBUG_ACTIONS         = 1 << 18,
-  GTK_DEBUG_RESIZE          = 1 << 19,
-  GTK_DEBUG_LAYOUT          = 1 << 20
+  GTK_DEBUG_INTERACTIVE     = 1 << 14,
+  GTK_DEBUG_TOUCHSCREEN     = 1 << 15,
+  GTK_DEBUG_ACTIONS         = 1 << 16,
+  GTK_DEBUG_RESIZE          = 1 << 17,
+  GTK_DEBUG_LAYOUT          = 1 << 18
 } GtkDebugFlag;
 
 #ifdef G_ENABLE_DEBUG

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 25e2047b133a36f26d4bab3781697c80b43121fc..21d1870894c89b108b3bf908a9b8ed9d251ce79b 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -167,8 +167,6 @@ static const GDebugKey gtk_debug_keys[] = {
   { "size-request", GTK_DEBUG_SIZE_REQUEST },
   { "no-css-cache", GTK_DEBUG_NO_CSS_CACHE },
   { "baselines", GTK_DEBUG_BASELINES },
-  { "pixel-cache", GTK_DEBUG_PIXEL_CACHE },
-  { "no-pixel-cache", GTK_DEBUG_NO_PIXEL_CACHE },
   { "interactive", GTK_DEBUG_INTERACTIVE },
   { "touchscreen", GTK_DEBUG_TOUCHSCREEN },
   { "actions", GTK_DEBUG_ACTIONS },

diff --git a/gtk/inspector/visual.c b/gtk/inspector/visual.c
index 718043a4d9dd174e6e2df062c41208146c771d25..400a75104bfcc5994758073eda48b4db0c3ce8d6 100644 (file)
--- a/gtk/inspector/visual.c
+++ b/gtk/inspector/visual.c
@@ -269,27 +269,6 @@ layout_activate (GtkSwitch *sw)
   redraw_everything ();
 }
 
-static void
-pixelcache_activate (GtkSwitch *sw)
-{
-  guint flags;
-
-  flags = gtk_get_debug_flags ();
-
-  if (gtk_switch_get_active (sw))
-    flags |= GTK_DEBUG_PIXEL_CACHE;
-  else
-    flags &= ~GTK_DEBUG_PIXEL_CACHE;
-
-  gtk_set_debug_flags (flags);
-  /* FIXME: this doesn't work, because it is redrawing
-   * _from_ the cache. We need to recurse over the tree
-   * and invalidate the pixel cache of every widget that
-   * has one.
-   */
-  redraw_everything ();
-}
-
 static void
 widget_resize_activate (GtkSwitch *sw)
 {
@@ -940,7 +919,6 @@ gtk_inspector_visual_class_init (GtkInspectorVisualClass *klass)
   gtk_widget_class_bind_template_callback (widget_class, rendering_mode_changed);
   gtk_widget_class_bind_template_callback (widget_class, baselines_activate);
   gtk_widget_class_bind_template_callback (widget_class, layout_activate);
-  gtk_widget_class_bind_template_callback (widget_class, pixelcache_activate);
   gtk_widget_class_bind_template_callback (widget_class, widget_resize_activate);
   gtk_widget_class_bind_template_callback (widget_class, software_gl_activate);
   gtk_widget_class_bind_template_callback (widget_class, software_surface_activate);

diff --git a/gtk/inspector/visual.ui b/gtk/inspector/visual.ui
index 4bf1867042109e1983a5c8f3ac8b57f738649068..7e28451811a1fe8a3469c3bf869df06140a17907 100644 (file)
--- a/gtk/inspector/visual.ui
+++ b/gtk/inspector/visual.ui
@@ -599,40 +599,6 @@
                     </child>
                   </object>
                 </child>
-                <child>
-                  <object class="GtkListBoxRow">
-                    <property name="visible">True</property>
-                    <property name="activatable">False</property>
-                    <child>
-                      <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
-                        <property name="margin">10</property>
-                        <property name="spacing">40</property>
-                        <child>
-                          <object class="GtkLabel" id="pixelcache_label">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">Show Pixel Cache</property>
-                            <property name="halign">start</property>
-                            <property name="valign">baseline</property>
-                            <property name="xalign">0.0</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkSwitch" id="pixelcache_switch">
-                            <property name="visible">True</property>
-                            <property name="halign">end</property>
-                            <property name="valign">baseline</property>
-                            <signal name="notify::active" handler="pixelcache_activate"/>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
                 <child>
                   <object class="GtkListBoxRow">
                     <property name="visible">True</property>
@@ -875,7 +841,6 @@
       <widget name="updates_label"/>
       <widget name="baselines_label"/>
       <widget name="layout_label"/>
-      <widget name="pixelcache_label"/>
       <widget name="touchscreen_label"/>
       <widget name="gl_label"/>
       <widget name="software_gl_label"/>